4 years ago · 11ff237319
--- a/api/maintenance_views.py
+++ b/api/maintenance_views.py
@@ -8,7 +8,7 @@ from django_response import response
 
                 from paginator import pagination
              
 
                 
              
 
                 from maintenance.models import MaintenaceInfo
              
 
                -from utils.admin_utils import is_maintenanceman
              
 
                +from utils.admin_utils import is_maintenanceman, is_admin
              
 
                 from utils.error.errno_utils import MaintenaceStatusCode
              
 
                 
              
 
                 
              
@@ -73,6 +73,7 @@ def maintenance_delete(request):
 
                 def maintenance_update(request):
              
 
                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              
 
                     maintenace_id = request.POST.get('maintenace_id', '')
              
 
                +    admin_id = request.POST.get('admin_id', '')
              
 
                     user_id = request.POST.get('user_id', '')
              
 
                     name = request.POST.get('name', '')
              
 
                     phone = request.POST.get('phone', '')
              
@@ -92,7 +93,7 @@ def maintenance_update(request):
 
                     except MaintenaceInfo.DoesNotExist:
              
 
                         return response(MaintenaceStatusCode.MAINTENACE_NOT_FOUND)
              
 
                 
              
 
                -    if user_id != maintenace.user_id and not is_maintenanceman(brand_id, user_id):
              
 
                +    if user_id != maintenace.user_id and not is_admin(brand_id, admin_id):
              
 
                         return response(MaintenaceStatusCode.MAINTENACE_PERMISSION_DENIED)
              
 
                 
              
 
                     if name:
              
@@ -127,12 +128,13 @@ def maintenance_update(request):
 
                 @logit
              
 
                 def maintenance_list(request):
              
 
                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              
 
                +    admin_id = request.POST.get('admin_id', '')
              
 
                     user_id = request.POST.get('user_id', '')
              
 
                     page = request.POST.get('page', 1)
              
 
                     num = request.POST.get('num', 20)
              
 
                 
              
 
                     maintenaces = MaintenaceInfo.objects.filter(status=True)
              
 
                -    if not is_maintenanceman(brand_id, user_id):
              
 
                +    if not is_admin(brand_id, admin_id):
              
 
                         maintenaces = maintenaces.filter(user_id=user_id)
              
 
                     maintenaces = [maintenace.data for maintenace in maintenaces]
              
 
                     maintenaces, left = pagination(maintenaces, page, num)
              
--- a/utils/admin_utils.py
+++ b/utils/admin_utils.py
@@ -1,7 +1,11 @@
 
                 # -*- coding: utf-8 -*-
              
 
                 
              
 
                -from mch.models import MaintenancemanInfo
              
 
                +from mch.models import MaintenancemanInfo, AdministratorInfo
              
 
                 
              
 
                 
              
 
                 def is_maintenanceman(brand_id, user_id):
              
 
                     return MaintenancemanInfo.objects.filter(brand_id=brand_id, user_id=user_id, status=True).exists()
              
 
                +
              
 
                +
              
 
                +def is_admin(brand_id, admin_id):
              
 
                +    return MaintenancemanInfo.objects.filter(brand_id=brand_id, admin_id=admin_id, status=True).exists()